merge
authorack@kneesa.uk.xensource.com <ack@kneesa.uk.xensource.com>
Thu, 6 Apr 2006 17:58:39 +0000 (18:58 +0100)
committerack@kneesa.uk.xensource.com <ack@kneesa.uk.xensource.com>
Thu, 6 Apr 2006 17:58:39 +0000 (18:58 +0100)

Trivial merge